Merge "SkinFactory: Improve documentation and comments"